Always NULL out bg_pixmap, even when it used to be None or parent

2002-02-24  Alexander Larsson  <alla@lysator.liu.se>

	* gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
	Always NULL out bg_pixmap, even when it used to be None
	or parent relative.

diff --git a/ChangeLog b/ChangeLog
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b69e42d6d19207aadaeb4fbff0ea98ac409ac22f..6447bb3e89a155f9e3dd5bd3a7405a7b6057a407 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-02-24  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_background):
+       Always NULL out bg_pixmap, even when it used to be None
+       or parent relative.
+
 2002-02-24  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (parent_class): parent_class variable was

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 3c5d2ee40805bc1e5b8058fa83434db77bf6138b..37de3ff28ace415b48044add9f2f359699489e9b 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1961,10 +1961,9 @@ gdk_window_set_background (GdkWindow *window,
   if (private->bg_pixmap &&
       private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
       private->bg_pixmap != GDK_NO_BG)
-    {
-      gdk_pixmap_unref (private->bg_pixmap);
-      private->bg_pixmap = NULL;
-    }
+    gdk_pixmap_unref (private->bg_pixmap);
+  
+  private->bg_pixmap = NULL;
 }
 
 /**